@@ -402,6 +402,7 @@ def consumer_info_api(request):  | 
            ||
| 402 | 402 | 
                user.shots_num += 1  | 
            
| 403 | 403 | 
                if user.level < UserInfo.MEMBER_BLACK_GOLD:  | 
            
| 404 | 404 | 
                user.level += 1  | 
            
| 405 | 
                + user.integral += model.shot_member_integral  | 
            |
| 405 | 406 | 
                # 发放会员权益  | 
            
| 406 | 407 | 
                             r.rpushjson(MEMBER_SEND_COUPON_LIST, {
               | 
            
| 407 | 408 | 
                'brand_id': brand.brand_id,  | 
            
                @@ -64,7 +64,7 @@ class BrandInfoAdmin(admin.ModelAdmin):  | 
            ||
| 64 | 64 | 
                 | 
            
| 65 | 65 | 
                 | 
            
| 66 | 66 | 
                class ModelInfoAdmin(DeleteModelAdmin, admin.ModelAdmin):  | 
            
| 67 | 
                -    list_display = ('brand_id', 'brand_name', 'jancode', 'model_id', 'model_name', 'model_uni_name', 'model_full_name', 'model_descr', 'category', 'warehouse', 'image', 'url', 'image2', 'factory_yuan', 'integral', 'position', 'display', 'status', 'created_at', 'updated_at')
               | 
            |
| 67 | 
                +    list_display = ('brand_id', 'brand_name', 'jancode', 'model_id', 'model_name', 'model_uni_name', 'model_full_name', 'model_descr', 'category', 'warehouse', 'image', 'url', 'image2', 'factory_yuan', 'integral', 'position', 'display', 'is_important', 'shot_type_id', 'shot_member_integral', 'shot_member_image', 'shot_member_name', 'status', 'created_at', 'updated_at')
               | 
            |
| 68 | 68 | 
                     list_filter = ('brand_name', 'category', 'warehouse', 'shot_type_id', 'display', 'status')
               | 
            
| 69 | 69 | 
                     readonly_fields = ('brand_name', 'factory_fee')
               | 
            
| 70 | 70 | 
                     search_fields = ('brand_id', 'brand_name', 'jancode', 'model_id', 'model_name', 'model_uni_name', 'model_full_name', 'model_descr', 'category', 'warehouse')
               | 
            
                @@ -153,7 +153,7 @@ class ModelInfo(BaseModelMixin):  | 
            ||
| 153 | 153 | 
                factory_yuan = models.FloatField(_(u'factory_yuan'), default=1000, help_text=u'出厂价(元)')  | 
            
| 154 | 154 | 
                factory_fee = models.IntegerField(_(u'factory_fee'), default=100000, help_text=u'出厂价(分)')  | 
            
| 155 | 155 | 
                 | 
            
| 156 | 
                - integral = models.IntegerField(_(u'integral'), default=100, help_text=u'积分')  | 
            |
| 156 | 
                + integral = models.IntegerField(_(u'integral'), default=100, help_text=u'【销售员】卡路里')  | 
            |
| 157 | 157 | 
                 | 
            
| 158 | 158 | 
                position = models.IntegerField(_(u'position'), default=1, help_text=u'排序')  | 
            
| 159 | 159 | 
                 | 
            
                @@ -162,7 +162,7 @@ class ModelInfo(BaseModelMixin):  | 
            ||
| 162 | 162 | 
                is_important = models.BooleanField(_(u'is_important'), default=False, help_text=_(u'是否重要型号'), db_index=True)  | 
            
| 163 | 163 | 
                 | 
            
| 164 | 164 | 
                shot_type_id = models.CharField(_(u'shot_type_id'), max_length=32, blank=True, null=True, help_text=u'镜头类型唯一标识', db_index=True)  | 
            
| 165 | 
                - shot_member_integral = models.IntegerField(_(u'shot_member_integral'), default=0, help_text=u'镜头会员积分')  | 
            |
| 165 | 
                + shot_member_integral = models.IntegerField(_(u'shot_member_integral'), default=0, help_text=u'【消费者】镜头会员积分')  | 
            |
| 166 | 166 | 
                shot_member_image = models.ImageField(_(u'shot_member_image'), upload_to=upload_path, blank=True, null=True, help_text=u'镜头会员图片')  | 
            
| 167 | 167 | 
                shot_member_name = models.CharField(_(u'shot_member_name'), max_length=255, blank=True, null=True, help_text=u'型号全名称')  | 
            
| 168 | 168 | 
                 |